From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sat, 28 Jul 2012 08:44:35 +0000 (-0300)
Subject: tests: Fix borders test
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~6245
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=114fb4219b0fff7de167d572a37b00be76b479f3;p=gnome-shell.git

tests: Fix borders test

Bad merge

https://bugzilla.gnome.org/show_bug.cgi?id=680801
---

diff --git a/tests/interactive/borders.js b/tests/interactive/borders.js
index 0e27058c5..97d049d50 100644
--- a/tests/interactive/borders.js
+++ b/tests/interactive/borders.js
@@ -84,7 +84,6 @@ function test() {
     function addGradientCase(direction, borderWidth, borderRadius, extra) {
         let gradientBox = new St.BoxLayout({ style_class: 'background-gradient',
                                              style: 'border: ' + borderWidth + 'px solid #8b0000;'
->>>>>>> 2aff593... tests: Run each test in a function
                                              + 'border-radius: ' + borderRadius + 'px;'
                                              + 'background-gradient-direction: ' + direction + ';'
                                              + 'width: 32px;'